bitkeeper revision 1.1159.212.128 (4208d72fZEHIE9NOZZbr91V7R-3gUg)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 8 Feb 2005 15:13:51 +0000 (15:13 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 8 Feb 2005 15:13:51 +0000 (15:13 +0000)
commitff64f33c9cb9ed3e5efd7a27c52a81bcf78d31b2
tree97050e8c0c47c1aa36ef6fb7bb8f57b34c45ea7f
parent74ade1a59d3cacf02267467e5a10215ea10798c9
parentf87f8a7110e5dd57091b8484685953414693e2a3
bitkeeper revision 1.1159.212.128 (4208d72fZEHIE9NOZZbr91V7R-3gUg)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
xen/arch/x86/mm.c
xen/arch/x86/traps.c